gnomeos: Pull in libgcrypt, use ostree-init from git

diff --git a/gnomeos/yocto/classes/gnomeos-contents.bbclass b/gnomeos/yocto/classes/gnomeos-contents.bbclass
index 795e1a86846fa8056a503ea8c4dac76442b8ec25..64f4d5f7360b6230b3a9a1f7b83d0a6d867f1f4b 100644 (file)
--- a/gnomeos/yocto/classes/gnomeos-contents.bbclass
+++ b/gnomeos/yocto/classes/gnomeos-contents.bbclass
@@ -16,11 +16,13 @@ IMAGE_INSTALL = "libuuid1 \
                 libogg0 \
                 speex \
                 libvorbis \
+                 libstdc++6 \
+                 libgnutls26 \
                 "
 
 RECIPE_PACKAGES = "task-core-boot \
                   coreutils \
-                  ostree ostree-init \
+                  ostree \
                   strace \
                   bash \
                   tar \

diff --git a/gnomeos/yocto/recipies-core/images/gnomeos-contents-devel.bb b/gnomeos/yocto/recipies-core/images/gnomeos-contents-devel.bb
index 8d3aad4f27d85a704e10679fed765251aaff0d89..7cd8573311637b4dab027ca3c194cfbae0080d4c 100644 (file)
--- a/gnomeos/yocto/recipies-core/images/gnomeos-contents-devel.bb
+++ b/gnomeos/yocto/recipies-core/images/gnomeos-contents-devel.bb
@@ -26,4 +26,12 @@ IMAGE_INSTALL += "libuuid-dev \
                  libogg-dev \
                  speex-dev \
                  libvorbis-dev \
+                 libstdc++-dev \
+                 libcap-dev \
+                 libcap-bin \
+                 libgpg-error-dev \
+                 libtasn1-dev \
+                 libtasn1-bin \
+                 libgcrypt-dev \
+                 libgnutls-dev \
                  "

diff --git a/gnomeos/yocto/recipies-core/initscripts/initscripts-1.0/dbus b/gnomeos/yocto/recipies-core/initscripts/initscripts-1.0/dbus
index 0b3a9dcd8dff405f1221866c7461d16c5dd2ebba..67d0d82ee67675d727b6e861110b7c55b1c54d8f 100644 (file)
--- a/gnomeos/yocto/recipies-core/initscripts/initscripts-1.0/dbus
+++ b/gnomeos/yocto/recipies-core/initscripts/initscripts-1.0/dbus
@@ -3,6 +3,7 @@
 start()
 {
        echo -n "Starting dbus daemon: "
+       mkdir -p /var/run/dbus
        /usr/bin/dbus-daemon --system
 }
 

diff --git a/gnomeos/yocto/recipies-core/ostree-init/ostree-init.bb b/gnomeos/yocto/recipies-core/ostree-init/ostree-init.bb
deleted file mode 100644 (file)
index a167ad7..0000000
--- a/gnomeos/yocto/recipies-core/ostree-init/ostree-init.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-SUMMARY = "Root switcher"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-
-SRC_URI = "file:///src/ostree-init"
-S = "${WORKDIR}/ostree-init"
-
-inherit autotools